-
-
Notifications
You must be signed in to change notification settings - Fork 5.5k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Fix queue worker incorrectly stopped when there are still more items in the queue #29532
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
wxiaoguang
added
type/bug
backport/v1.21
This PR should be backported to Gitea 1.21
labels
Mar 2, 2024
GiteaBot
added
the
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
label
Mar 2, 2024
pull-request-size
bot
added
the
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
label
Mar 2, 2024
wxiaoguang
force-pushed
the
fix-queue-worker
branch
2 times, most recently
from
March 2, 2024 04:18
28ba710
to
b2fa278
Compare
wxiaoguang
force-pushed
the
fix-queue-worker
branch
from
March 2, 2024 06:58
b2fa278
to
4e0f19b
Compare
lunny
reviewed
Mar 2, 2024
lunny
approved these changes
Mar 2, 2024
GiteaBot
added
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
and removed
lgtm/need 2
This PR needs two approvals by maintainers to be considered for merging.
labels
Mar 2, 2024
delvh
approved these changes
Mar 2, 2024
GiteaBot
added
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
and removed
lgtm/need 1
This PR needs approval from one additional maintainer to be merged.
labels
Mar 2, 2024
Co-authored-by: delvh <dev.lh@web.de>
lunny
added
the
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
label
Mar 2, 2024
GiteaBot
pushed a commit
to GiteaBot/gitea
that referenced
this pull request
Mar 2, 2024
…in the queue (go-gitea#29532) Without `case <-t.C`, the workers would stop incorrectly, the test won't pass. For the worse case, there might be only one running worker processing the queue items for long time because other workers are stopped. The root cause is related to the logic of doDispatchBatchToWorker. It isn't a serious problem at the moment, so keep it as-is.
GiteaBot
added
backport/done
All backports for this PR have been created
and removed
reviewed/wait-merge
This pull request is part of the merge queue. It will be merged soon.
labels
Mar 2, 2024
wxiaoguang
pushed a commit
that referenced
this pull request
Mar 2, 2024
…in the queue (#29532) (#29546) Backport #29532 Without `case <-t.C`, the workers would stop incorrectly, the test won't pass. For the worse case, there might be only one running worker processing the queue items for long time because other workers are stopped. The root cause is related to the logic of doDispatchBatchToWorker. It isn't a serious problem at the moment, so keep it as-is.
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Mar 3, 2024
* upstream/main: Breaking summary for template refactoring (go-gitea#29395) [skip ci] Updated translations via Crowdin Fix incorrect cookie path for AppSubURL (go-gitea#29534) gitea.service: Remove syslog.target (go-gitea#29550) Add option to set language in admin user view (go-gitea#28449) Fix elipsis button not working if the last commit loading is deferred (go-gitea#29544) Fix incorrect relative/absolute URL usages (go-gitea#29531) Add support for API blob upload of release attachments (go-gitea#29507) Fix queue worker incorrectly stopped when there are still more items in the queue (go-gitea#29532) remove util.OptionalBool and related functions (go-gitea#29513) Rename Action.GetDisplayName to GetActDisplayName (go-gitea#29540) Make PR form use toast to show error message (go-gitea#29545)
This comment was marked as off-topic.
This comment was marked as off-topic.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Labels
backport/done
All backports for this PR have been created
backport/v1.21
This PR should be backported to Gitea 1.21
lgtm/done
This PR has enough approvals to get merged. There are no important open reservations anymore.
size/M
Denotes a PR that changes 30-99 lines, ignoring generated files.
type/bug
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Without
case <-t.C
, the workers would stop incorrectly, the test won't pass. For the worst case, there might be only one running worker processing the queue items for long time because other workers are stopped. Thanks to oliverpool for looking into the problem and proposing a fix.Actually, the real problem is not completely fixed, the root cause is not directly related to the ticker, but is related to the logic of doDispatchBatchToWorker. It isn't a serious problem at the moment, so keep it as-is. More comments are added.